Autogenerated HTML docs for v2.26.0-rc1-11-g30e99
diff --git a/git-rebase.txt b/git-rebase.txt index 8c1f4b8..f7a6033 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -699,6 +699,16 @@ https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.) +Commit Rewording +~~~~~~~~~~~~~~~~ + +When a conflict occurs while rebasing, rebase stops and asks the user +to resolve. Since the user may need to make notable changes while +resolving conflicts, after conflicts are resolved and the user has run +`git rebase --continue`, the rebase should open an editor and ask the +user to update the commit message. The merge backend does this, while +the apply backend blindly applies the original commit message. + Miscellaneous differences ~~~~~~~~~~~~~~~~~~~~~~~~~
